Conflict Resolution Models for Resolving Pinch and Crunch Conflicts