commit before merge
changes
changes