Updated prism' docs
simplify, then simplify, then simplify, then ...
Finished conflict resolution.