def check_conflicts(unmerged):
 if prefs.check_conflicts():
  unmerged = [path for path in unmerged if is_conflict_free(path)]
 return unmerged

def check_conflicts ( unmerged ) : if prefs . check_conflicts ( ) : unmerged = [ path for path in unmerged if is_conflict_free ( path ) ] return unmerged
checks if there are any conflicting arguments passed .