fixed some conflict stuff in 3b from a failed merge