diff --git a/core/api.txt b/core/api.txt
index e301b172a6..34e875c3bb 100644
--- a/core/api.txt
+++ b/core/api.txt
@@ -916,12 +916,8 @@ ion-picker-column,prop,disabled,boolean,false,false,false
 ion-picker-column,prop,items,PickerColumnItem[],[],false,false
 ion-picker-column,prop,mode,"ios" | "md",undefined,false,false
 ion-picker-column,prop,value,number | string | undefined,undefined,false,false
-<<<<<<< HEAD
-ion-picker-column,event,ionChange,{ value: string | number | undefined; },true
-=======
 ion-picker-column,method,setFocus,setFocus() => Promise<void>
-ion-picker-column,event,ionChange,PickerColumnItem,true
->>>>>>> origin/FW-5580
+ion-picker-column,event,ionChange,{ value: string | number | undefined; },true
 
 ion-picker-column-option,shadow
 ion-picker-column-option,prop,color,"danger" | "dark" | "light" | "medium" | "primary" | "secondary" | "success" | "tertiary" | "warning" | string & Record<never, never> | undefined,'primary',false,true