конфликт исправлен

frontend/src/store/store.ts

 import {configureStore} from '@reduxjs/toolkit';
 import userSlice from './users/users.slice';
-<<<<<<< frontend/src/store/store.ts
 import { postsSlice } from './posts/posts.slice';
-=======
 import commentsSlice from './comments/comments.slice';
->>>>>>> frontend/src/store/store.ts
 
 export const store = configureStore({
 	reducer: {
 		user: userSlice,
-<<<<<<< frontend/src/store/store.ts
 		posts: postsSlice.reducer,
-=======
 		comments: commentsSlice
->>>>>>> frontend/src/store/store.ts
 	},
 });