commit before merge with master