st/xorg: fix merge droppings