Gir reset added to remove merge conflicts