Fixed conflicts in MR.