If this doesn't have a size, everything explodes.
Resolve conflicting files