stop to merge develope into your own branch

Use rebase instead:

1. git checkout develop
2. git pull
3. git checkout feature/#X-my_feature
4. git rebase origin/develop

If there are some conflicts :
5. resolved conflicts
6. git rebase --continue
7. if there are still conflicts, go to 5