saving pyc
fixedmergeconflicts
 fixed the wsgi