x230 merge
resolving x230