added missing conflict partial