Occasionally Failing Test

Changed the order server side to ensure Synchronization messages are always published before Conflict resolution ones.

Do you think it would be important to add a test to enforce that ordering for the future?