commiting prior to merge