log in, registration, contact form, google maps
conflicts
fixes
woocommerce cart, checkout, confirmation
conflicts
better formatting
conflicts