confirm merge -s ours with user.