wry neck, torticollis lots of names for it.
ice rather than heat makes most sense over inflammed joint. if you must use heat then brief warm shower at most.
non steroidal anti-inflamms + paracetamol often prescribed (check with medico/pharmacist first).
chiro and other qualified people treat these on a daily basis.
