fix mistakes in geda.py merge