Merge updates from plex_consistency and resolve conflicts