cleanup README
fix merge conflict