bootstrap merge