Fixed leftover merge data