Fix merge conflict from 9124d578