precompile assets
update conflict