Changes to fix conflicts from merge