Update conv.cpp