add a line  --3rd chagne
4th change -- add a line
5th change -- add another line
6th change - solve a conflict