Merge seems to have gone awry. Fixed what I've noticed.