Fix collision after merge and remove old meta file.