Fixing botched merge