merge fixes woo