ship merge fixes