merge appears fixed #226

Closed majickdave closed 7 years ago