Kate- more merge conflict resolution