Commiting before merging branch