Wow, one of my merges produced a lot of mess.