fix flash and group failure

[bingzhang]

Description

Please provide a summary of the pull request and the issue it fixes. Please add necessary details, context, dependencies, explanation of when review is needed (see next section), etc.

Fixes #(add issue number here and remove parentheses)

Review Time Estimate

Please give your idea of how soon this pull request needs to be reviewed by selecting one of the options below. This can be based on the criticality of the issue at hand and/or other relevant factors.

• [ ] Immediately
• [ ] Within a week
• [x] When possible

Type of changes

Please select a relevant option:

• [x] Bug fix (non-breaking change which fixes an issue).
• [ ] New feature (non-breaking change which adds functionality).
• [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected).
• [ ] Other (any another change that does not fall in one of the above categories.)

Checklist:

Please select all applicable options:

• [ ] I have signed the Rokwire Contributor License Agreement (CLA). (Any contributor who is not an employee of the University of Illinois whose official duties include contributing to the Rokwire software, or who is not paid by the Rokwire project, needs to sign the CLA before their contribution can be accepted.)
• [x] I have updated the CHANGELOG.
• [ ] I have read the Contributor Guidelines.
• [ ] I have performed a self-review of my own code.
• [ ] I have commented my code, particularly in hard-to-understand areas.
• [ ] My change requires updating the documentation.
• [ ] I have made necessary changes to the documentation.
• [ ] I have added tests related to my changes.
• [ ] My changes generate no new warnings.
• [ ] New and existing unit tests pass locally with my changes.
• [ ] Any dependent changes have been merged and published in downstream modules.

---

[sandeep-ps]

Also, please fix the merge conflict. Thanks.

[bingzhang]

Also, please fix the merge conflict. Thanks.

fix conflicts, please take a look.