Remove merge conflict cruft and fix ruby style (rubocop)