lane collapse persists

[schacon]

If you collapse a lane and then it gets auto-unapplied by a merge conflict, when you view it, it's still collapsed. Not in the workspace, but in the "let me look at this branch" view.