Commiting resolved conflict