resolve mergeing problems