removed duplicate file
Merge branch 'master' into user-photo
merge conflict