Update podspec
Updated project
Resolve merge confict