Fix merge error
Fix merge error

codeminery/gfw,Vizzuality/gfw,KarlaRenschler/gfw,apercas/gfw,KarlaRenschler/gfw,apercas/gfw,codeminery/gfw,codeminery/gfw,codeminery/gfw,apercas/gfw,KarlaRenschler/gfw,apercas/gfw,Vizzuality/gfw,KarlaRenschler/gfw