Added private.xml
Resolved private.xml merge conflict