Fix conflicta

Signed-off-by: Artem Savchenko <armisav@gmail.com>

Merge branch 'develop' of https://github.com/hcengineering/platform i…

…nto staging-new

Signed-off-by: Artem Savchenko <armisav@gmail.com>

Merge branch 'develop' of https://github.com/hcengineering/platform i…

…nto staging-new

Merge branch 'develop' into staging-new

Merge branch 'develop' of https://github.com/hcengineering/platform i…

…nto staging-new

Signed-off-by: Artem Savchenko <armisav@gmail.com>

Merge branch 'develop' into staging-new

Merge branch 'develop' into staging-new

Merge branch 'develop' of https://github.com/hcengineering/platform i…

…nto staging-new

Signed-off-by: Artem Savchenko <armisav@gmail.com>

Merge branch 'develop' into staging-new

Merge branch 'develop' of https://github.com/hcengineering/platform i…

…nto staging-new

Signed-off-by: Artem Savchenko <armisav@gmail.com>