Here's this.
Resolve conflicts.