changed line 6
merge conflict resolved