When there is a conflict in a story or a book, usually a character finds a way to make it better. This is called a conflict resolution. It could be an internal or external conflict, and it doesn't always have a resolution. If it is resolved, then the resolution is the conflict resolution. I hope this helped!
