various Bugfixes conflict disables