Xcode 5 gitignore addition and merging conflict in SMS verification function