updating universe class
fixed merge conflict