Merge remote changes: Remove .env and .idea from repository

Resolved conflicts by accepting deletion of:
- .env (now in .gitignore)
- .idea directory (IDE-specific files)

These files should not be tracked in the repository.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <[email protected]>