remove conflict markers #9

Closed jacobzlogar closed 6 years ago