conflict C-r remove