removed merge garbage
remerged process.py