scratching around
added local artigo files
forced unresolved merge