Fixing merge conflicts in p4merge