- Add .next to .gitignore to prevent future conflicts - Remove all build artifacts from git tracking - Focus on source code changes only for cleaner merges