deal with conflict
deal with conflict, delete old ones