precompiled assets
fixed log merge conflicts