worked on joining
conflcits