balints conflict fix