fix Gaby's merge