Fix merge typo.

Signed-off-by: Evan McClain <aeroevan@gmail.com>
1 file changed