fix accept theirs command; use remoteName param