fix silly closet hanger merge bug involving flex