dev files override
dev files added II
dev and live files merged after crash
update + rebuilt features
features updated