XML file for merge added, gitignore fixed