Fixed some git conflicts

yep. That’s what i did
Yolo

dfa