scripts
fixing conflicts