commiting the merge