fixed small conflict in rightsidebar.vue

Co-authored-by: Chris Davis <[email protected]>
Co-authored-by: Ji Kim <[email protected]>
Co-authored-by: Jigar Patel <[email protected]>
Co-authored-by: Linden Young <[email protected]>

Author: 5 people