conflict deleted