readme update
minor fix
merge fix