fix merging problem
Merge pull request #1599 from OCHA-DAP/dev-merge

fix merging problem