fix bootstrap 2 and 3 merge conflict