hdp and _build in gitignore
fixed crazy bug; stuff already on collections
conflict fix