Updated none to None.
Fixed conflicts.