shake disabled
merge conflict resolved
merge conflicts
recipe changes
ui fixes
merge conflicts
merge conflicts
resolves
bootstrap offline