use digest_path to find right asset js for ck-editor config
fix merge conflicts