Fixed conflicts from last merge