kind of getting there with photo upload
resolving conflicts