fixing my conflict fixes