Added notification for upload
Merged conflicts