Undo line IDs
Fix merge (util.geo -> geo)