resolve conflicts, and change input from sample_list to set(sample_list)