fix merge, comment out broken line in labler