merge levelbuilder changes