Avoid crash when skipping remote test
More merge.conflictstyle fixes