merged change crom crystark