Update podfile

Removed conflicts