Fixing a line that was stomped on by a bad merge