Implemented conflict solver which are able to solver parts of the conflict