try git rm
rm some .pyc
Merge branch 'backend_thread' of https://github.com/stochss/stochss into backend_thread
remove background_thread and try