fixed constant conflicts