finished merging .kdevelop file