Fix completely botched merge