resolving conflicts if any
Merge branch 'develop' of github.com:pinakin19a88d-Swami/inspire7 into develop