Merge conflicted deleted