Added enough parameters to make for a generally useful merge tool