# \#upgrade-conflit

**URL:** https://hub.mender.io/tag/upgrade-conflit/88.md

[Latest](https://hub.mender.io/latest.md) · [Categories](https://hub.mender.io/categories.md) · [Tags](https://hub.mender.io/tags.md)

---

## [Server upgrade from 1.5.x to 1.6.1](https://hub.mender.io/t/server-upgrade-from-1-5-x-to-1-6-1/868)

<div class="topic-metadata">

**Author:** [@juliosmelo](https://hub.mender.io/u/juliosmelo)\
**Replies:** 4\
**Last updated:** [August 2, 2019, 7:57pm UTC](https://hub.mender.io/t/server-upgrade-from-1-5-x-to-1-6-1/868 "2019-08-02T19:57:14Z")

</div>

Hi there, I’m trying to update my production to version 2.0.1. I just tried to follow the documentation but something weird is happening. When a tried to merge with the tag 1.6.1 some git conflicts appears. git merge …