do not delete whole comment but just conflicts