conflict merge, bugfixes