Remove spurious conflict dirs that arrived during the git migration