properties.json merge data

[TimBoonstra]

I was just browsing to the code and noticed that ther properties.json file has a "merge" conflict commited into the file that apperently wasn't resolved but checked in instead

"options": [
  {
    "name": "Submit A Crawl Job",
    "value": "Submit A Crawl Job",
<<<<<<< HEAD
    "action": "Submit A Crawl Job Default",
    "description": "Submits a job to crawl a URL and all accessible subpages",
=======
    "action": "Submit a crawl job",
    "description": "Submits a job to crawl a URL and all accessible subpages.",
>>>>>>> eca7dd0fee40d0d0d0301a3d90a0dc3565987b95
    "routing": {
      "request": {
        "method": "POST",
        "url": "=/crawl"
      }
    }
  },