i think i finally fixed the merge conflicts