Delete .merge.py.swp