change Podfile
remove conflict