Updating for Xcode 4.5
Ignore user data
Merge result