Fix commit conflict

Comment out settings on default bootstrap