Fixed remaining conflict