This covers two of the four cases of change/delete conflicts -- in an upcoming patch we'll make :other cover the other two.