working fix for upload and profile pic
resolve merge issues