Although the father had made ____ ____ his daughter, there was still a strain between him and his son-in-law.

back on

off with

up with