updated to have xcode repo
updated merge