Merge photo tess

:cow: