let
m_resolve_conflicts =
"Resolve merge conflicts"