Don't ignore bootstrap
merge ignore