resolving merge conflicts

2017-11-16, Gary Kramlich