better xml format for pinning config
merge conflict resolved