fix incorrect merge
1 file changed