Cleaned conflicts