Facing several times a merging conflict due to slightly changed data model diagrams that some table is moved to different position.
Like when in existing data model diagram in trunk a table is moved to different position and same happened in a branch version also, but then to different position.
Can this be avoided that it comes as conflict?