fixed merge conflict
made my image not pixelated