Fix polyglot merge conflicts