solve the continent country doesn't match problem
solve conflit