Fixed missed merge conflict