Deletes
Merge Conflict Resolution
Merge Resolution