fix leftover conflicts from last merge