- Resolved conflict in templates/index.html - Kept local delete modal responsive styles - Merged documentation updates from remote (DOCKER.md, README.md)