Fix a mis-merge