removed conflict files