forgot about photo.java now conflicts resolved