Changed Assets Serialization back to Mixed becuase it doesn't really matter.

Any changes to the scene that have conflicts will not be able to be
resolved, we will have to move forward with one version or the other.