merge in the n6 apps and frameworks