[#441] Fix bad merge