Fix borked gemfile. Be careful with merge conflicts!