fixing dumb conflicts x2