Synchronizing with upstream and resolving conflict.