Seriously the most confusing thing in both Xenforo template editing and even when syncing stuff in iTunes or iCloud or on your Mac or in Google Drive, Dropbox.com, Box.com, Ubuntu One and all those other syncing services gotta be Version Conflicts. In Xenforo we can merge both the old file and new. Doesn't it do so automatically sometimes? Or does it always make us merge the conflicts manually? I think in vBulletin 4 it merges everything automatically. Anyway I'm going to experiment with all the cloud services and even stuff like iTunes to see how they handle version conflicts.