fix conflicts for name label