Merge with CAF. No error