Score style
Fixing merge conflicts
merge conflict
Nothing, just fixing git stupidity