merge conflict #18

Closed Knight-X closed 6 years ago