modified third line
resolved conflicts