Fix extra merging.