add own color uniform vector to shader
merge conflict