fix git merge conflict in install.xml