commit before merge master