i believe ive fixed the merge conflicts