style updates
new post: unconflitme-to-help-you-resolve-conflicts