Merge and commit push