Resolve conflict
Release 1.16-2
Resove conflict