Formatting aliases, adding WP block, merge conflict fix