Working with Danny on a manual code merge. For six of the files, the merge was kinda crazy and hard to follow using the merge tools. We ended up looking at things on a more general level and trying to add in the new changes on top of the old code vs trying to merge the old and new code. We went through things and made changes. After that, I pushed up the new code.