after removing conflict