Fix merge conflict from the previous commit