fix confilct #20

Closed kaylinkhanal closed 1 year ago