merge Level builder changes into finished