Merged better, with actual merging