adds styling
resolves conflicts
recompiling