fixing piam's merge