Fixed math library problem
Fixed conflicts