zoom in photos
change paths for server
merge conflict fix