# Server upgrade from 1.5.x to 1.6.1

**URL:** <https://hub.mender.io/t/server-upgrade-from-1-5-x-to-1-6-1/868>\
**Category:** General Discussions\
**Tags:** upgrade-conflit\
**Created:** [July 30, 2019, 5:54pm UTC](https://hub.mender.io/t/server-upgrade-from-1-5-x-to-1-6-1/868 "2019-07-30T17:54:45Z")\
**Posts on this page:** 5\
**Page:** 1

<div class="post-metadata">

**Author:** ![juliosmelo](https://avatars.discourse-cdn.com/v4/letter/j/9fc29f/32.png) [@juliosmelo](https://hub.mender.io/u/juliosmelo)\
**Post date:** [July 30, 2019, 5:54pm UTC](https://hub.mender.io/t/server-upgrade-from-1-5-x-to-1-6-1/868/1 "2019-07-30T17:54:45Z")

</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 1.6.0 --no-ff  
Auto-merging tests/tests/test\_basic\_integration.py  
Auto-merging other-components.yml  
CONFLICT (content): Merge conflict in other-components.yml  
Auto-merging extra/release\_tool.py  
Auto-merging extra/license-overview-generator  
CONFLICT (content): Merge conflict in extra/license-overview-generator  
Auto-merging docker-compose.yml  
CONFLICT (content): Merge conflict in docker-compose.yml  
Auto-merging docker-compose.tenant.yml  
CONFLICT (content): Merge conflict in docker-compose.tenant.yml  
Auto-merging docker-compose.client.yml  
CONFLICT (content): Merge conflict in docker-compose.client.yml  
Automatic merge failed; fix conflicts and then commit the result.

But I didn’t change anything in these files. Any ideas?

I’m using documentation bellow  
[https://docs.mender.io/1.6/administration/upgrading](https://docs.mender.io/1.6/administration/upgrading)

---

<div class="post-metadata">

**Author:** ![drewmoseley](https://yyz2.discourse-cdn.com/flex036/user_avatar/hub.mender.io/drewmoseley/32/47_2.png) [@drewmoseley](https://hub.mender.io/u/drewmoseley)\
**Post date:** [July 30, 2019, 8:29pm UTC](https://hub.mender.io/t/server-upgrade-from-1-5-x-to-1-6-1/868/2 "2019-07-30T20:29:31Z")

</div>

Hi @juliosmelo ,

Welcome to Mender Hub. I’m not sure why you would have reported conflicts in those files, but since you didn’t modify them, you can just accept the changes from the new tag.

Drew

---

<div class="post-metadata">

**Author:** ![juliosmelo](https://avatars.discourse-cdn.com/v4/letter/j/9fc29f/32.png) [@juliosmelo](https://hub.mender.io/u/juliosmelo)\
**Post date:** [August 2, 2019, 2:15pm UTC](https://hub.mender.io/t/server-upgrade-from-1-5-x-to-1-6-1/868/3 "2019-08-02T14:15:07Z")

</div>

First of all. Thanks for your time and help @drewmoseley. I really appreciate. Let me ask a question. Do you know if is possible just backup database in the version 1.5.1 and just restore the data in a new server instance in the version 2.0.1?

---

<div class="post-metadata">

**Author:** ![drewmoseley](https://yyz2.discourse-cdn.com/flex036/user_avatar/hub.mender.io/drewmoseley/32/47_2.png) [@drewmoseley](https://hub.mender.io/u/drewmoseley)\
**Post date:** [August 2, 2019, 4:07pm UTC](https://hub.mender.io/t/server-upgrade-from-1-5-x-to-1-6-1/868/4 "2019-08-02T16:07:34Z")

</div>

I don’t know. We generally only test upgrades one release at a time so I would suggest you move through 1.6, 1.7 and then 2.0.

---

<div class="post-metadata">

**Author:** ![juliosmelo](https://avatars.discourse-cdn.com/v4/letter/j/9fc29f/32.png) [@juliosmelo](https://hub.mender.io/u/juliosmelo)\
**Post date:** [August 2, 2019, 7:57pm UTC](https://hub.mender.io/t/server-upgrade-from-1-5-x-to-1-6-1/868/5 "2019-08-02T19:57:14Z")

</div>

Thanks so much @drewmoseley I upgrade my server to 2.0.1