merging appears broken