Repair merge conflict manually