rebased develop and resolved the merge conflicts