add gist capability
merge conflicts