merge kdevelop