fix forgotten merge conflict