[#2565] Fixing a bad merge conflict