rollbacked 2 commits; rake is still green