Fix a merge misstake