Fixing conflict
Fixing conflicts
Fixing transparency error