redeleting content @bpapman already deleted, after conflic fix