This looks like a leftover merge resolution