fixing dumb conflicts x3