some minor things in intro
resolved conflict