fix bootstrap conflict issues