resolve some duplicates/conflicts