add an extra assert
Merge remote-tracking branch 'origin/master'
fix whitespace conflict