Removing conflict text