Deleted
Conflict solved