resolve view conflict