Remove constant conflicts