devlint

Auto-resolves Git merge conflicts so agents only touch the complex hunks.