Kind of fixing a broken merge thing