commit in the home
slove the conflict