Fix: missed merge conflicts