build associations
resolve merge conflicts
squashes