assert...
Merge remote-tracking branch 'origin/master'
race condition fixed?