Sync

Sync modal showing colored diff preview of artifact changes

Diff viewer modal with colored changes

Merge conflict resolution modal