added some lines
successfully merged