After git ignore fixed by Max.
resolve merge confilct Symeetry/HomeViewController.m
correct more merge conflict
resolve merge conflict Symeetry.xcodeproj/project.pbxproj