removed figure files
fixed conflicts
remove figures