Resolve conflict.
auto-split
2017-09-25, Eric Fritz