update i decided to just do the merge hope you don't mind i would still appreciate it if you could check my work