mearge it now 

merge it