poverty.r is now a kind of scratch file
removed built package
fixing conflicts
fixed merge conflicts