Fixed shaders after merge conflict