removed another line of the merge conflict