Fix a careless merge
1 file changed