Fixing conflicts part 2