added file upload loading animation
resolve merge conflict