erasing files
fixing conflicts