Fixes #25
fix conflict