assets precompile add in config/application.rb
conflicts resolution