Added merge-conflicts package