add ssh exception
correct the mess in upmerge logic