MessageParser tests
Merge conflict resolution