Remove forgotten merge code