minor fix to project photo
fixed conflicts