Attempting to fixing conflicts 3