I did also re-download maps, so I think (hope) they're up to date.
fetch, pull --rebase, then make again? will try that.
---> dang, :~/ufoai$ git pull --rebase
U base/ufos/ptl_misc.ufo
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.