added solr-spatial-field entries to schema.xml
cleaned up trivial merge conflict