Mistake when fixing conflicts