fix conflict and delete sample