Added more refined feature merging.