If the conflict document was deleted, consider this to be a non conflict
Removing dead code