fixed broken README
fixed merge conflict