More copyright merges