merge
updated to not have stupidity