add dantley
resolves conflict
Merge branch 'ckbzo-master'