Fix merge conflict.
expand-list
2017-10-03, Eric Fritz