wiz 2
resolve conflict