- solveing conflict