fixing conflict resolution issues

example/src/MessageBubble.tsx

@@ -4,6 +4,7 @@ import type { Message } from './utils';
 
 type Props = {
   item: Message;
+  index: number;
 };
 
 export const MessageBubble: React.FC<Props> = ({ item, index }) => {

example/src/MessageListExample.tsx

@@ -5,13 +5,6 @@ import { FlatList } from 'react-native-bidirectional-infinite-scroll';
 import { MessageBubble } from './MessageBubble';
 import { Message, queryMoreMessages } from './utils';
 
-const ItemSeparatorComponent = () => <View style={{
-  borderBottomColor: 'black',
-  height: 0,
-  borderBottomWidth: 1,
-  marginVertical: 10
-}} />;
-
 const App = () => {
   const [messages, setMessages] = useState<Array<Message>>([]);
   const flRef = useRef(null);

src/types.ts

@@ -6,11 +6,6 @@ export type WebFlatListProps<T> = Props<T> & {
   onScroll: (event: React.UIEvent<'div', UIEvent>) => void;
 };
 
-export type WebFlatListProps<T> = Props<T> & {
-  ListEmptyComponent: React.ComponentType;
-  onScroll: (event: React.UIEvent<'div', UIEvent>) => void;
-};
-
 export type Props<T = unknown> = Omit<
   FlatListProps<T>,
   'maintainVisibleContentPosition'