merge jellybean with legacy