Resolve conflicts

src/server/web/app/desktop/views/components/following.vue

@@ -1,8 +1,8 @@
 <template>
 <mk-users-list
 	:fetch="fetch"
-	:count="user.following_count"
-	:you-know-count="user.following_you_know_count"
+	:count="user.followingCount"
+	:you-know-count="user.followingYouKnowCount"
 >
 	フォロー中のユーザーはいないようです。
 </mk-users-list>
@@ -15,7 +15,7 @@ export default Vue.extend({
 	methods: {
 		fetch(iknow, limit, cursor, cb) {
 			(this as any).api('users/following', {
-				user_id: this.user.id,
+				userId: this.user.id,
 				iknow: iknow,
 				limit: limit,
 				cursor: cursor ? cursor : undefined