sdk + sample project + readme
resolve conflict