manual bootstrap merge