Manual merge of branches. Everyone in project helped.