updated merge conflict on job searc page #99

Closed delaneysharratt closed 5 years ago