updating connections to be ajaxy in wake of merge conflicts