commit before merge in master