Updated sample code.
Resolved conflict.