added idhir3.xml
fixing merge conflicts