New sample update
Resolve conflict