1994 merc black max 225 hp ----stalls when shifting

[fishmaster2]

got a 225hp black max that stalls when shifting from forward to reverse --- had my wrench check it all out set up idle ect.---but when you are idling into dock then go to shift into reverse thats when it likes to stall ( not a good time)
ANY IDEAS???