Fixing conflicts

Style