modification of Solution to be able to identify conflicts