resolved conflict in application_helper