Fix merge issue

emerge couldn't handle the diff and I forgot about it – my bad.