bugfix: fix bad merge