Fix merge conflict in Gemfile.lock after susy gem was added