checking conflicts in patch