new associations and migrations added

merging associations