readme update
conflict repair