Updated conflicts and documentation