[ci skip] Fix conflicts for app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue