merge xtyle master