updating
fixing conflicts