Fixed constant conflicts