reset two commits back for alternative solution