Fixed leftover merge comments