resolving conflict #19

Closed brinkbrink closed 1 year ago