The Crucible?

In the book The Crucible the conflict was between Proctor and Parris. proctor thought parris was a bad preacher thats why proctor hadn't been to church in a while. how was this conflict resolved according to the book