fixing merge conflicts : getting the commits from ni-/ni-dm from which you were behind 

before sending pull request - may be try to pull from ni-/ni-dm