remove conflict markers #30

Closed yapdianhao closed 4 years ago