This is a local change.
resolve conflict in bootcamptext.md