Fixed bad merges