Add script to resolve conflicts
Use gevent to resolve conflicts faster