Resolve conflcts

Resolve conflcts

*Step 1. Fetch and check out the branch for this merge request*

git fetch origin
git checkout -b feature/desarquivamento origin/feature/desarquivamento

*Step 2. Review the changes locally*

*Step 3. Merge the branch and fix any conflicts that come up*

git checkout develop
git merge --no-ff feature/desarquivamento

*Step 4. Push the result of the merge to GitLab*
git commit -m ""
git push origin develop