fix comflit