bugfixes
merge resolution