found typeerror
merge
Merge branch 'dev'
issues with .png
photos