bugfix with merge