small changes
fixing conflicts