Misc:\n- Repo fix and conflict resolve.

This changelog entry has no additional details.