Merge

Makes my brain ache: merge.