Cleanup old conflicts