Resolve conflict issue, and remove sample code.