merge linux/win to xcp