Reset previous precompile changes, removed asset digests
Fixed merge conflicts