Resolving edit conflict

Not sure what happened there…