Fixed leftover merge info