Xcode 6.1 fixes
Fix merge conflict