photo and permissions
merge