wed morning
fixed conflicts in bookmodal