I can't tell what the problem might be just from that. I'd suggest reversing the changes and retry the merge, and make sure you do it carefully. It's best to avoid merging if you can - if you have two branches where someone does something like add an event variable with the same name, then merging them will result in a bad project. So avoid merging, and if you have to, do it really carefully. And... yeah, if you're still using r225, you should definitely update. It might be related to a bug we already fixed long ago.