Explain how Git manages branches and resolve a scenario where a merge conflict occurs during a production release.
