Fix conflicts from last merge