Repair of conflict

Repair of conflict