proper court photo upload
merge conflict