Fixed conflicts in 'sync_kobocat_xforms' after merging with 'two_databases'
Fixed conflicts in 'sync_kobocat_xforms' after merging with 'two_databases'

kobotoolbox/kpi,kobotoolbox/kpi,kobotoolbox/kpi,kobotoolbox/kpi,kobotoolbox/kpi