commit before merging master