BD thursday updates
fixed conflicts