first pull
resolved conflicts 2
Issues -2,3,5,6,7,8,9,10