added photos eps
fixed conflicts