Fix rubocop and merge error too