commiting for conflicts