Corrected geoalchemy.py merge