git rebase and merge
troublesome for fortran tips