Conclusion, references, flushend
conflict resolved
Merge remote-tracking branch 'drart/master'

* drart/master:
  Conclusion, references, flushend