fixed conflict with xcode .git