fixing conflicts again, and fixing a bug