fixing a dumb merge