Created sample protocol XML
Fixed merge conflicts