[BUGFIX] Removed conflict marker from latest merge in help text