#making up #conflict resolved #friends again #coming together after fight