fixed all the merge duplicates
fixed plist