resolved conflicts in plists