fix bad merge
1 file changed