Had to git reset my rails app, I had no idea what went wrong...