before merge, commit first