x11, stay connected
merge