merging dungeon changes