Resolving merge conflicts in application.html.haml after search was added as well as styling