merging with (old) gist