Merge levelbuilder changes into finished