get rid of weird conflict
bugfixes