Deleted a leftover merge thing.