Minor typos fixed

Workflow for documentation production in OSM.md

@@ -10,7 +10,7 @@ The process is based on:
 
 In the edition process there are two roles:
 
-- **Contributors.** Anyone contributing content to a given document, with no special privileges. They cannot contribute directly to `master` branch, so they have to contribute pushing branches and issuing a _merge request_ (i.e. requesting their intergration).
+- **Contributors.** Anyone contributing content to a given document, with no special privileges. They cannot contribute directly to `master` branch, so they have to contribute pushing branches and issuing a _merge request_ (i.e. requesting their integration).
 - **Editor/Reviewer**. The person (or people) in charge of integrating (_merging_) contributions into the main document. In consequence, they can push changes directly to the `master` branch. They should also decide the document split in different files and provide the means to build and convert the document to a given set of target formats and templates.
 
 ## Software requirements
@@ -103,7 +103,7 @@ It is also highly advisable adding an SSH key to https://osm.etsi.org/gitlab/pro
 git clone git@osm.etsi.org:osm-doc/test.git
 ```
 
-**TEMPORARY URL**:
+**>>>>> TEMPORARY URL**:
 
 ```bash
 git clone https://osm.etsi.org/gitlab/osm-doc/test.git