Resolve some of the larger conflicting files.