fixed merge conflict #53

Closed vyang14 closed 2 years ago