Added labels.
Fixed merge conflicts.