Fix schema drop in upload files
Fix conflict
Merge branch 'master' of ssh://gitlab.kiranatama.net:222/agus.amirudin/asia-foundation-survey