controller specs
merge conflict gemfile.lock
blabla