fix merge conflicts in application.html