Added merge and groupby