sorry about all the merge conflicts

trying to fix the issue