Message store for job and instructor listings
Conflicts resolved