Change samething (XCode did it)
Merge remote-tracking branch 'origin/master'