fix unknown conflict