fix
conflict change
Alex's fix to delete issue