fixing the merge conflicts so that you can refresh on reload#212

Ryaken-Nakamoto merged 1 commit intomainCode-4-Community/c4c-ops:mainfrom

ticket_200_merge_conflict_resolutionCode-4-Community/c4c-ops:ticket_200_merge_conflict_resolutionCopy head branch name to clipboard