misteryBox added
conflict fix