Fixed classes github messed up during merge