testing stuff
dded smart host file generation
merge conflict fix