Resolve conflict in LandingPage.vue

web/src/components/AboutPage.vue

web/src/components/CMS/fetchProfile.vue

web/src/components/CMS/updateFunctionalType.vue

web/src/components/CondensateDetailPage.vue

web/src/components/CondensateUpdateItemsTable.vue

web/src/components/DDCODE/fetchCondensate.vue

web/src/components/DDCODE/fetchProtein.vue

web/src/components/DDCODE/fetchStats.vue

web/src/components/Datatable/CondensateDataTable.vue

web/src/components/Datatable/ProteinDataTable.vue

web/src/components/LandingPage.vue

web/src/components/Links.vue

web/src/components/LlpsTable.vue

web/src/components/ProteinDetailPage.vue

web/src/components/ProteinUpdateItemTable.vue

web/src/components/StatPage.vue

web/src/components/UpdateItemTable.vue

web/src/components/js/datatable.js

web/src/views/ForgotPassword.vue

web/src/views/Help.vue