Resolved Podfile conflicts