Commit on master after merge