Adds conflict resolution cmds