Fix old merge conflict