fix #42
fix conflict