Makefile updated

The help file  share/isisscripts.txt  can also cause a merge-conflict
which can easily be avoided, as this file is generated automatically.
   make resolve_conflict
does now also
  git checkout share/isisscripts.txt
.