improved merging of geometries
fixed wrong logic when automerging geometry attributes
Merge pull request #491 from volaya/geom_diff

Fixed problems with geometries when merging

Tested with an existing repo that was previously reporting conflicts on geometries that should have been merged automatically.  Now works.