fix bad merging