attempt to handle non-ff merges

will probably a while until I can test this