Work on preview of diffs when merging with a remote package