fix forgotten merge