Fix remaining conflict