Fix the problem in gatein-resources.xml while merging