final conflict resolved