Merging failed AIDE commit changes with Eclipse cleanup
addint new ids.xml resource