fix for merge regression
Merge pull request #493 from kobotoolbox/merge-regression-fix

fix for merge regression