Fix merge garbage.