recommit changes (where are the conflicts?)