updating README and some info
fixing conflicts