Would you like to copy the permanent link to your clipboard?
Permanent link:
https://jazz.net/forum/questions/249348/unable-to-resolve-merge-conflicts-while-working-on-same-file/249350