mri deadline
fixed merge conflict