Remove conflict testing code