Fix the merge errors

Fix the problems with the labels.