Fix forgotten merge conflicts