conflict fixes on user-management.html