Capstone, integrate a conflicting branch

A realistic team scenario. A feature branch and main both edited the same config line. Merge them and resolve the conflict by hand, keeping the feature's value and main's other change, then commit the merge.