commit before merging