rollback to 6 commits and revert changes