merge local version with git