hmm yes you're right, I was mislead by the name of each list on the blog post, it's true that nothing prevent me from naming each column "new" , "in progress" , "ready for qa", and "done" , my bad. this + burn down charts (like proposed in https://gitlab.com/gitlab-org/gitlab-ee/issues/91 ) would really start for us to make gitlab embrassing the full life-cycle of our products.

As for resolving conflict by merging, thanks I didn't know EEhad this feature.