commit before merge
merge commit
merge