fixed the conflicts from the last merge