gui & cli
merge