merge code from Chameleon OS not CfX