You can't force anything to get along, it would go against the laws of nature. Just give them time to sort things out and eventually things will be fine.