dtp
resolve conflict