update file upload logic
remove country code check
resolve merge conflict