resolve conflict fixed