Degrees bug fixed
Fixed conflicts