Service xml conflicts resolved for Leave Holidays and Leave Type/Rule