Fix option conflict + update documentation, close #2227