stylin'
conflict resolution
assets precompile; deploying