Added BugButton Podspec file
Fixed merge conflict