1 2 3
Auto-merging new CONFLICT (content): Merge conflict in new Automatic merge failed; fix conflicts and then commit the result.