Fixing conflicts

didn't see conflicts noted