many changes and commit before merge with master