PG support.
Resolve conflicts.