Fixed merge conflict issue I missed