conflict comment deleted