echo fix
merge