removing conflict text