Resolving conflict after revert.