Fix misc bad merges