update help ids for Resolve Conflicts dlg

Change-Id: I5b682de419e348bfe46ac34fcd1ac72251cbef2d