resolving main conflict part2