fix a mis-merge