fixed mia's merge issues