bad merge (python & human error)