fixed conflicts #17

Closed davidsean closed 5 years ago