associations in database created
association in db created
solve merge conflit and association in db created