line 3 has been editted
fixed merge conflict