fixed a bug that was preventing merges from working, apparently?