Fix merge conflict

This commit is contained in:
Cole Bemis
2017-02-27 20:58:04 -08:00