Remove forgotten merge things