use plain pull instead of rebase.
Merge branch 'develop'