Changes to GET Conflicts

get/conflicts