added 3&4 th line
resolved conflicts