Modified metadata files.
Modified metadata files.
Resolving conflict.