fixes typo
write merge.py in progress