git checkout develop
git merge –no-ff feature/CHE-8800
if still confilct
solve it and add it to version controller
commit it
try again git merge –no-ff feature/CHE-8800
git push origin develop