Installed git-plus and merge-conflicts packages