hello
merge bro
i added stuff to line 3
made a different change on line 3
steve was right