conflict was left: accept most from 1.15.
paul