Updated mdmerge stuff