Throw error when there is no name collision + clarify merging logic