thanks for sharing your issue. Unfortunately this is "by design". If a user clicks on OK in the properties dialog, the object will be marked as "modified" - even if it hasn't been modified. This is because of the datastructure we use internally. Not sure if I should go into all the details but it's related to how Royal TS determines which properties should be written (we do not write values which are "default" values for efficiency). So there's a chance that even though the user didn't change the value, it might change the object because of a changed default value and there's no other way to ensure the new value will be written to disk. In this case, the user who clicked OK last will win in the merge scenario.