fix merged cm12 files