readme fix
conflict solve