Changed XML files for correctish template, added comment to test merging