correct a line I missed in a merge conflict