Resolve teh conflicts