Merge remote-tracking resolved