That's absolutely normal... that's why we should merge often.PS: "very old features" won't merge regardless of what tool, model or methodology you use.
