trying to commit from cli
merge theirs
added dns