commit one
commit two
commit three
commit test
commit four
revert
merge