new post iphone battery
Fix conflicts