fix conflicted meta file
fix merge.