finished final tier of contour conflict resolution, ready for bug-checking and making sure everything works