fixed merge conflict in mets