Making sure everything is commited before merging