bag fix
merge
photo error message