.cursor/rules/software_development.mdc

@@ -171,7 +171,6 @@ debugging, architecture decisions, and testing.
 - [ ] Environment impact assessed for team members
 - [ ] Pre-build validation implemented where appropriate
 
-<<<<<<< HEAD
 ## Additional Core Principles
 
 ### 4. Dependency Management & Environment Validation
@@ -224,12 +223,3 @@ debugging, architecture decisions, and testing.
 
 - **Narrow Types Properly**: Use type guards to narrow `unknown` types safely
 - **Document Type Decisions**: Explain complex type structures and their purpose
-=======
----
-
-**Status**: Active development guidelines
-**Priority**: High
-**Estimated Effort**: Ongoing
-**Dependencies**: base_context.mdc, research_diagnostic.mdc
-**Stakeholders**: Development team
->>>>>>> master