Removed redundant annotation
The history knows about conflicts and applying to an existing program