deleted line 8
changed text in line 8
solved merge conflicts