commiting before merging