merge conflict - bugfix