Change gemfile
Ugh
Fix conflicts
I hate everything
Delete unnecessary files