Fixed conflicts from merge