removing conflict copies