fixed github conflict

yeppers
line 20 only

hahah
trying to figure this out

yeppers