added references to figures
fixed conflicts