Remove leftover merge artifact