precompile assets and fix merge conflicts