having huge issues with merging, not sure what to do

[jybaran]

think this is maybe resolved but i had to edit files online, remove event-narwhal & reclone, hopefully didnt miss anything

plus github app is acting up so that's not letting me log in