fix #42, closing
fix conflict