Committing changes before merge