done with git reset
now at revert
still at revert
revert conflict solved