No conflict has been resolved due to conflicting content changes, name changes or encoding changes. These conflicts will ...