metafiles
Resolving conflicts