merge changes into level-builder