merge new upstream into existing dfsg deletions