Resolve conflicts in doc/user/project/quick_actions.md

doc/user/project/quick_actions.md

@@ -41,7 +41,6 @@ do.
 | `/clear_weight` | Clears the issue weight |
 | `/board_move ~column`      | Move issue to column on the board |
 | `/duplicate #issue`        | Closes this issue and marks it as a duplicate of another issue |
-<<<<<<< HEAD
 | `/move path/to/project`    | Moves issue to another project |
 | `/tableflip`               | Append the comment with `(╯°□°)╯︵ ┻━┻` |
 | `/shrug`                   | Append the comment with `¯\＿(ツ)＿/¯` |
@@ -49,9 +48,3 @@ do.
 
 Note: In GitLab Starter every issue can have more than one assignee, so commands `/assign`, `/unassign` and `/reassign`
 support multiple assignees.
-=======
-| `/move path/to/project`        | Moves issue to another project |
-| `/tableflip`               | Append the comment with `(╯°□°)╯︵ ┻━┻` |
-| `/shrug`                   | Append the comment with `¯\＿(ツ)＿/¯` |
-| <code>/copy_metadata #issue &#124; !merge_request</code> | Copy labels and milestone from other issue or merge request |
->>>>>>> upstream/master