added line 3 another.html
fixed merge conflicts