precompiled assets
merge conflicts
fixed admin similar to user