What are some stiff neck remedies? Ice or heat?

Stiff neck. Massage, tens unit, pt, sphenopalatine ganglion block, etc... With regard to heat or ice -i usually ask which one makes you feel better?