Fixed bad merging