Working with Bryan. Looking over some files to help with some merge conflicts. Making changes and trying to retrofit things that were made on both old and new branches. We kept running into some issues. We may make a new branch and then plug in pieces vs trying to update the old code from the old branch. Basically, change the direction of how we are retrofitting things together. That should help.