merging the develop branch with staging