Removed conflict files