Resolve doc/user/project/issues/create_new_issue.md

Signed-off-by: Rémy Coutable <remy@rymai.me>

doc/user/project/issues/create_new_issue.md

@@ -59,7 +59,6 @@ supported.
 
 ![Bottom of a project issues page](img/new_issue_from_email.png)
 
-<<<<<<< HEAD
 ## New issue via Service Desk **[PREMIUM]**
 
 Enable [Service Desk](../service_desk.md) to your project and offer email support.
@@ -80,16 +79,14 @@ create issues for the same project.
 
 ![Create issue from group-level issue tracker](img/create_issue_from_group_level_issue_tracker.png)
 
-=======
->>>>>>> upstream/master
 ## New issue via URL with prefilled fields
 
 You can link directly to the new issue page for a given project, with prefilled
-field values using query string parameters in a URL. This is useful for embedding 
-a URL in an external HTML page, and also certain scenarios where you want the user to 
+field values using query string parameters in a URL. This is useful for embedding
+a URL in an external HTML page, and also certain scenarios where you want the user to
 create an issue with certain fields prefilled.
 
-The title, description, and description template fields can be prefilled using 
+The title, description, and description template fields can be prefilled using
 this method. The description and description template fields cannot be pre-entered
 in the same URL (since a description template just populates the description field).
 
@@ -99,9 +96,6 @@ Follow these examples to form your new issue URL with prefilled fields.
 and a pre-entered description, the URL would be `https://gitlab.com/gitlab-org/gitlab-ce/issues/new?issue[title]=Validate%20new%20concept&issue[description]=Research%20idea`
 - For a new issue in the GitLab Community Edition project with a pre-entered title
 and a pre-entered description template, the URL would be `https://gitlab.com/gitlab-org/gitlab-ce/issues/new?issue[title]=Validate%20new%20concept&issuable_template=Research%20proposal`
-<<<<<<< HEAD
 
 [Markdown]: ../../markdown.md
 [quick actions]: ../quick_actions.md
-=======
->>>>>>> upstream/master