Adds merge-conflicts package