cleaned conflicts