broke everything sorry guys
merge conflicts
i hope i didnt break everything
trying to fix all merge conflicts
hopefully fixed everything
trying very hard to undo the shitstorm of mergeconflicts