modifications
fixing conflicts