Committing to master after branching