Zaahir/manual merge cusip


//cc @jagtalon @tommytommytommy