added testkit / resolving conflicts