Fix merge error in previous commit