merge remote
edit namelist
Merge branch 'master' into gh-pages