fixing a seriously broken merge