* soft reset and remove a commit, then commit the further commits again * fix flagging for tests * format fix * fixes Co-authored-by: Ali <aliabid94@gmail.com>