Simplify the conflict retry code
Re-prepend new content when the navigation file changes remotely