resolve doc/ci/variables/where_variables_can_be_used.md

doc/ci/variables/where_variables_can_be_used.md

@@ -111,7 +111,6 @@ They are:
 - **not supported:**
   - by the definitions [described in the table](#gitlab-ci-yml-file) where the "Expansion place" is "GitLab"
   - in the `only` and `except` [variables expressions](README.md#variables-expressions)
-<<<<<<< HEAD
 
 ## Secret variables with an environment scope
 
@@ -131,5 +130,3 @@ my-job:
     variables:
       - $STAGING_SECRET == 'something'
 ```
-=======
->>>>>>> upstream/master