manual merge of level stuff, new assets