merge-conflicts package added.