fix a incorrect merge
1 file changed