added line 5
fixed merge conflicts