Finish patching merge errors. That's what I get for restoring like I did