ran 'make clean' to purge build files, see if it can merge nicely now...