bugfix - merge inconsstency