clean up
fix readme conflict