Messy merging complete