Care to share a botched merge story of yours? I try to learn from others mistakes.