git told me this file had been "removed by both of us"