scanner changeS
resolved conflict