Resolve conflict (for real this time).
auto-split
2017-09-25, Eric Fritz