finished section contour conflict resolution tiers in mergeTool (gui). ready for bugchecking and making sure all functionality works