removing conflict line