diff --git a/ios/RCTBEEPickerManager/BzwPicker.m b/ios/RCTBEEPickerManager/BzwPicker.m
index 245a3c9ec6941f64f295806696b27307aa862b88..fc7003b0e1293a726b03d3a7a5b34edc39f6db45 100755
--- a/ios/RCTBEEPickerManager/BzwPicker.m
+++ b/ios/RCTBEEPickerManager/BzwPicker.m
@@ -85,11 +85,7 @@
     
     [view addSubview:cenLabel];
     
-<<<<<<< HEAD
     self.pick = [[UIPickerView alloc] initWithFrame:CGRectMake(0, 40, self.frame.size.width, self.frame.size.height - 40)];
-=======
-    self.pick = [[UIPickerView alloc] initWithFrame:CGRectMake(-5, 40, self.frame.size.width+5, self.frame.size.height - 40)];
->>>>>>> dfafe73491181099295072df68b4d0ebb18d38a8
     
     self.pick.delegate = self;
     self.pick.dataSource = self;
diff --git a/package.json b/package.json
index 6219b50e7acd948f04a6cdec54d775c4fb3b1169..d5be6aecb2ad2a1d4c66d6f65eccc0a5b164c183 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-picker",
-  "version": "4.0.12",
+  "version": "4.0.13",
   "description": "",
   "main": "index.js",
   "scripts": {