after application and gemfile conflict
changes to search