Merge level, character, traps
conflicts corrected