Write-up update
Fix merge conflicts