fixed issue with merge conflict #174

Closed aholdahl closed 4 years ago