updating gemfile and podfile
fixing podfile merge conflict