Edited nb-file in iss1
Edited on master
Merged conflict
Edits on iss1
Merge branch 'iss1'