[#43824875,#43831613] fixed conflict in application js