added lec6
conflict solved