Fix additional missed merge conflicts