Bugfix: error during merge