Fix merge conflict in changelog (omg).
expand-list
2017-10-03, Eric Fritz