partial merge with master
build new assets