Fixing my conflict resolve