Updated: Docs + Dependencies.
conflict solved