Fixed merge issue and precompile assets