bugfixes
merge conflict