add joinner contract
conflick
merged newest