Resolve conflicts between revisions and ancestor models using Simulink Projects.