"confilit resolved"