The girls are finally getting along