fix merge conflicts #156

Closed aholdahl closed 4 years ago