bugfix: incorrect conf merge