Aargh git merge bites again :S  (delete pdb)