bugfixes
fix conflict