line 2 updated
merge conflict fixed, other user was correct
oh yeahbuddy, conflict me