save and load fix, and tilesetwizard
mergeFix