something in claude's weights makes it terrified of conflicts and rebases. buddy, jj makes those basically free!